merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Tue, 8 May 2007 15:09:17 +0000 (09:09 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Tue, 8 May 2007 15:09:17 +0000 (09:09 -0600)

Trivial merge